Simplifying the build