More codestyle work.