Refactoring (Findbug Dependency Hierarchy Bugfix, toString Bugfix, ...)