DAR-1717 | Making code more handsome