changing colours and improving code