Refactoring of block sink - water filling.