Removed Comment line and cleaned some of the code