More reformatting and crap, also switching to a regexp to replace more characters