some refactoring for django 1.6 compatibility