cleaned up some of the code
Finished everything with the comments except editing