commit for further pull request

Some cosmetic changes...