fix comment and cleanup