Removed unnecessary lines 57-59