Fixed docblock
Fixed incorrect class name
Refactoring