Minor changes, regex remaps instead of magic