Change variable visibility
remove some getters