Fixed indentation and code clean up