ok. Feel free to make more such improvements and send PRs ;-)