Comments, Cleanup, format