Refactoring of className property for invocations, some cleaning and improvements