Removed unneccesary returns