refactor lbs module