changing names and cleaning up code
changing names and cleaning up code