DEV-98 | Apply comments