Some cleanups and comments
Some styling