Minor changes (coloring etc.)