Add colour option and clean up.