Fix typos & unnecessary imports