Minor Ruby style and module usability cleanup
Merge pull request #1 from jhart-r7/landing-4229-jhart

Minor Ruby style and module usability cleanup