PEP8 Cleanup
webserver wip