code style, fixes #3140
Code style and phpdoc fixes
Removed unused imports