qualified methods refactoring & bugfixing