(inc) completes basic refactor on user query
Merge pull request #143 from nrobeR/refactor/bookshelf

(inc) completes basic refactor on user query