Some codestyle work.

This is a beginning.