Clean up syntax a little