Improved formatting for ease of readability

I put subclasses in boxes to make it more apparent what their superclasses are.