Code cleanup (1)