Code style
Document the refactored class