Fixed indent problems and alignment