Some small fixes for DRY, and docs