cleaning up all of the code.