Additional revisions as addressed in #331