Refactor | Kyle and Beverly | added stubbing where required