VOL-42: Commendations

replace if with return and drop the curlies.