Cleaning up the code now.
Almost done with cleanups