Refactor setters