Refactoring, reduced number of internal calls to this.os()