let the refactoring begin
another minor fix