removing else since if clause returns and updating a comment