chore: clean up #2

Open
williamluke wants to merge 18 commits from lum/kitabu into master
18 Commits