refactoring for the build