Reduced visibility and lifetimes to improve encapsulation and reduce complexity
Removed unused class