some cleanup and some better naming