cleaning up some code and removing unimportand commented pieces of code