Improve syntax/appease Hound/squash