Refactoring and cleanup in OALplus
Refactoring and cleanup