Several fixes for respecting code conventions, to modify comments and to remove unused code.