Cleanup formatting and comments