minor cleanup, comments