Removed call to wfLoadExtensionMessages
Bump version nr
Improved style
Added method visibility
Refactor away code duplication