Fix indetation and other white space issues