Set defaults, clean up calls

[Refs #7]