refactoring and cleanup of MPWorks