clean up and tern arg hints fix