Make state less public, clearer naming