Formatting: Enclosed if statements

Also aligned the method parameters to make it a bit easier to read, and to allow the syntax highlighting module to work.