cleaned up type, added updated color, spacing, fixed lists