Separated setter and getter, cleaned