Fixed typos, CS and unused use statements