Fixed spacing and indentation issues