#353 Making use of non-void setters
#295 Improving comment