Simple cleanup

Using this for a project and decided to do a few little cleanup tasks. Merge 'em if you want 'em. All the doctests pass. Thanks!