Add comments and small style fixes.