Get rid of all the return's - replace with else if()'s