docks, refactoring