Cleaned up code

Performed formatter clean up, other minor fixes