Implemented review comments and added Changes for code cleanup