removed some unneeded returns, and a semi colon