Stylistic fixes, identations\spaces in end of lines