Refactoring
Build fix