Comments, colours and refactoring

add comments and refactored some duplications. Change some colours
around, need to think what works best