Add comments and remove commented out code.