Change some code and indentation problems