Code Style and docblock fixes