Refactoring, partial work on remaking Water class