Code cleanup - I