Removing unused imports
Docblock alignment