Removed some unecessary returns.