cleanup after code review