Basic code cleanup.