few cleanups as per our reqmnts