resolved todo regarding a bunch of strange regular expressions