Removed a few unused imports and made some naming changes.