Eliminated unneccessary return statements