Minor refactoring eliminating hard dependencies