More explicit remaps, just formatting