refactor: Incorporate proposed refactorings

Christian Dreherrequested to merge
20-refactor-armem into master

Closes #20 (closed)

Edited by Christian Dreher

Merge request reports