cleanup, comment and fix