refactor language builder
refactor language builder