Non-functional updates in reviewing issue #76