Fixing some typos and unused usings