Remove reek
Improve color-scheme