Colour tweaks and simplification of code