cleaned up syntax a little bit