Some cleanup
Make this standalone
More standalones
Some cleanup