some more code style updates