removed unused imports and added some more docblock annotations