Refactor PIDs and add result presenter
Revert dev config