refactorings for dj 1.5