Minor cleanup, convenient constructors