Cleanup and more YARD docs