refactoring
Fixed for merged