Removing unnecessary returns