Changes due to coding conventions

No match.