add missing brackets
remove some left over comments