Removed separate formatting tool, moved payload to C++