refactoring docking station