Renaming '__bad_names', refactoring, cleaning up a bit