KFSPTS-3644 : made changes based on review comments and added code
documentation.