Refactor of unused imports, spacing, comments