ticket:65 small clean up