Final comments and indentation issues