Minor cleanups #163

Merged
merged 2 commits into from Jun 3, 2015