Add colored text and some refactoring