cleaned up Formula building a bit