DAR-303: Fixed url link and code refactor