style and docblock fixes