Implemented helper methods and tidied up some loose ends. Relates to #94.