Cleanup, improve colours