clean up and better naming.