removing uneeded encapsulation