mainly just cleanup - code review is complete