Refactoring to use oglplus