Removed unnecessary imports and fixed up typos