Got rid of redundant getter and setter