small code cleanup
colors fix