Code Cleanup finished. Small derp fixed