refactor in BL classes