Refactored DNUBrik to use more local variables
Small refactorings