refactoring code / improvments on view / departements better