Improve code consistency

- Change all vars to lowercase-with-dashes
- Remove back-ticks from comment