Removed extraous returns