Cleaned the code a bit(Removed some code that was commented out)