fix word order, cleanup output
remove deprecated method