Fixing wrong docblock and organizing imports.