Cleanup

Mostly cleanup, commends, and some style issues