refactoring and work on colours