Cleanup

Reformatting and some other cleanups