colour changes, code cleanup