Minor update to remove unnessecary branching.
Removed unused function.
Test refactoring to 100% coverage.
Updated the var placeholder to allow dashes in the variable name.
vbump