Cleanup, alignment and comments