refactor encyclopedia a bit