recommit of the last commit, which had wrong message --> some
refactoring regarding issue #3