also: - reduced bloat by removing unnecessary std::forwards and std::moves - minor cleanup of example code