Change textual order of field declarations
Removed unused imports