Code cleanup, update bugs-everywhere
Code cleanup
Rename webapp methods