Removing @api annotations, moving getters to private visibility