DATACASS-32 : Completed : Refactoring completed after code review.