Enable color output and refactoring