Improving indentation and removing useless code.