Implemented 2/3 suggestions from #91