Implement the suggestions as described in issue #4