Cleanups

Remove unused imports and added blank lines to improve readability.