Refined the use of setters