Document method usage and slight refactoring
wip
refactor
wip refactor