Some more code style modification.