General Clean-up
Fix next color issue