lite refactor