micro refactor