Lite refactoring