some more clean up (code review)