code cleanup, 3.1.1