some encapsulation improvements