refactor for minimalism