Clarity in facade

Changed the facade to be more human-readable. (By throwing more objects
on the heap however, so there is the technical downside, but overal the
class is easier on the eye)