found some clean up on code review :)