More flat structure.
Quick sweep (spaces, remove unused code, confine velocity).