! Consistency is a beautiful thing...

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
! Minor code layout tweak

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #1067 from Oldiesmann/release-2.1

! Consistency is a beautiful thing...