some more on coding style and cleanup