compactified the code & made consistent use of WrangleLoc

- also: consistent white drawing style