Small syntax refactor