code cleanup / program optimization