Tidy up

Tidied up the code for StrucuralFormula
Tidy Up