cleaned up syntax a bit