This is outside of the scope of this PR (see improvements points 1,2 and 3). Please submit a new PR for this.