Normalized to 4 spaces instead of 2

Now that 4 spaces are in use, modified some longer statements to still respect 80 char line length