[#4] Getters and setters changed to 2 code lines