cleanup and better naming