refactor, adjust UI
Remove unneeded variable braces
Colorize useful tokens in debug output