Removed unnecessary returns