cleaned up identation and formatting in general