added colors, cleaned up formatting