Refactor + added colours!