1)Code cleanup