clean up syntax a little