Eliminated unneccessary return statements at the end of blocks