improve code and test regarding the comments in the pull-request