Fixed indentation issues + some more cleanup.