Misc changes: remove new line/whitespace, change wording, move some ifs