Fixed code reviews and indentation issues