Clean up yardocs and a few style issues
Land #8 - Fix style and yardoc from @jlee-r7