A little less code smell