Increased readability by decreasing white space

Got rid a lot of excess spacing, and switched from tab indents to double
space indents. Also dropped some explicit returns.