solve bug when dealing with classes with the same name but within a different module.
minor formatting updates