Minor changes such as comments and default color