Some minor changes to better show the classes and calls