Refactoring code to OAE standards