Cleanup
Add better example middleware and app