Refactoring - second try

I am also wondering about this.