Refactor entry_* and author_* methods based on @tpitale's feedback. #25