Addresses Comments

Addresses (first round of) comments by @wibeasley