Use custom colours where possible
Cut out old code and add comment