Code cleanup, typos.