Removing direct access to some variables