Refactoring movie rental project from Martin's book