fix exit change; major whitespace cleanup