light refactoring
light refactoring