Lang refactoring