Addressed feedback of #33, updated MR for same.