typos, use, unused and return fixed