Cleanin up some routing.
Simplify scanners.
Use braces.
use braces.