Refactoring of LavatoryType