Minor: make vars local
Minor: whitespace
New persistence. Clean!