Cleaning code and add parmaengine