Removed old code
Fixed subcomment scope