Cleanup. Mostly style and comments. Minor fixes here and there.