Syntax clean up

As above