minor cleanup, less lintian warnings