Replace getter functions with properties