Fixing up commented code