Misc formatting clean up
Refactor