some refactoring
better color scheme