Dls code review

Updated files according to code review comments.