Code refactoring
Core ref2