removed unused code, limited method access levels