Use kwargs in constructors to make instantiation easier; update example