cleaned code and added comments
Merge remote-tracking branch 'origin/import-pooja' into import-harish