Small improvements

Deactivated debug coloring, improved comments, refactoring.