Cleanups

Some simple code clean-ups found as I was familiarizing myself with the library.