Small refactoring.
Small changes needed.
Merge remote-tracking branch 'origin/sprint5' into sprint5