Refactor building recipes