Use regex for @arg parsing; add tools/clean.py; some cosmetics