Intox adjustments

Please review changes from upstream.
Nitpick but the spacing is really inconsistent here