div const cleanup