add: change proc code tokens. fixes: further cleanup for style and consistency