Fix indentation, remove unnecessary gaps

Left most of the actual code the same, don't worry!