General code cleanup!