Change udnerscor to dot in function names
Clean up plotting example, move split-apply higher up