No More Angry Jessie

Address @jeck's comments from #68