Refactoring and improving DOJOs content