some formatting, some defaults in __init__

A few extremely minor refactoring tidbits.