clean up some code
rename Server to Application