Minor code clean up

This closes #221.