Refactoring light build