Refactor to use more custom functions; introduce the ternary operator (in comments)
Merge pull request #1 from charliewilliams/master

Refactor to use more custom functions; introduce the ternary operator (i...