Tidy up

Cleaned up syntax a little