polish app/server/request part