Some dox, refactored