Rewrite for Space -> Super mapping, some improvements, removes & style