refactored code
Merge branch 'bk-your-feed' of https://github.com/lonelyplanet/rizzo into bk-your-feed