more complete code cleanup