Improved colors on logging output
Some refactoring