Cleanup, working on verify
Fix formatting