tiny cleanup
more cases
scan
x