Some cleanup and YARD docs