Cleanup the syntax a bit