Issue 272

Addresses #272, and a little bit of cleanup