Issues 72 & 111 - Refactoring common code