web: some more code cleanup