Change variable names to be clearer
Fix up chevron
Some DRY