Simplifying build