DAR-2572 | Jslint and changes after CR v2