#1 quick refactoring fix