Remove unneeded returns and typo