cleaned up syntax a little