Simplify coloring interface
Rename variables to avoid shadowing
Doctest fixes