Task1 : code clean up and refactoring

Change-Id: I6f611f1c0e8c670c233b2de8cb9cb93b7fc00b67
Signed-off-by: NiharKhetan <nihar.khetan@gmail.com>