Clean up syntax and naming to match my current style.
Merge branch 'cleanup'