Revision 2 - Colors & Cleanup