Tidy up setters