More code clean-up

General Code Clean Up and Indentation.