NEAT code cleanup.