fixed and cleaning of the code according to the comment on the pull request