remove commented code, fix comments