Fixed some cleanups on the code, to start fresh