cleanup, fonts, comments