Refactoring colour changing