removed redundant encapsulation