Cleaned up code.

Cleaned up names and colors.