Refactoring, quality option added