refactored as per Abi's code review
Merge branch 'master' of https://github.com/feministy/littlebooks into codereview_abi
Merge pull request #112 from feministy/codereview_abi

Refactored as per Abi's codereview