Close #99: Remove duplication in helper classes