refactoring - trivial