DAR-733 | Fixes after Code Review