Refactored all classes
reworded error message in dock method