Major General Cleanup

Remove unused imports, fix inconsistent indentations, fix some typos.