Cleared some unnecessary lines of code