remove commented code, spaces after commas.