Minor typos and refactors