Cleanup colors and improve naming of messages