Fix menber variables and scopes
To public class