Thanks a lot for the nice suggestions! Will fix them in another pull request.