application cleanup
Merge https://github.com/evashek/surferpedia