Code cleanup - 1