Fixed some warnings
Moved ExecutorModule function into corresponding cpp, added missing overload to remove assignment in if clause.