Fix some typos, organize things a bit

Change-Id: I59c3c8fe6ae5320f08529f7d11d192a7f407c4d6