Refactoring for hygeine