Removing unused imports/whitespace
Parameter docblock alignment
Removing unused imports