Tidying, and getting verification working.
Tidying.