clean up syntax a bit