Removing unused imports and adding spaces
Fixing up autogeneration