Code cleanup!