diff --git a/yarn-project/circuit-types/src/logs/function_l2_logs.ts b/yarn-project/circuit-types/src/logs/function_l2_logs.ts
index 1d9bc5f20337..ae7608b0e07a 100644
--- a/yarn-project/circuit-types/src/logs/function_l2_logs.ts
+++ b/yarn-project/circuit-types/src/logs/function_l2_logs.ts
@@ -7,7 +7,6 @@ import { randomBytes } from 'crypto';
 import { LogType } from './log_type.js';
 import { UnencryptedL2Log } from './unencrypted_l2_log.js';
 
-// ???????????????????????????????????
 /**
  * Data container of logs emitted in 1 function invocation (corresponds to 1 kernel iteration).
  */
diff --git a/yarn-project/end-to-end/src/e2e_avm_simulator.test.ts b/yarn-project/end-to-end/src/e2e_avm_simulator.test.ts
index 5ca521047fb8..18a6ce4d2dcf 100644
--- a/yarn-project/end-to-end/src/e2e_avm_simulator.test.ts
+++ b/yarn-project/end-to-end/src/e2e_avm_simulator.test.ts
@@ -25,11 +25,10 @@ describe('e2e_nested_contract', () => {
     it('Calls an avm contract', async () => {
       const a = new Fr(1);
       const b = new Fr(2);
-      // const expectedResult = a.add(b);
 
-      // TODO: fix type gen for avm_addArgsReturn - incorrect number of args
       logger('Calling avm_addArgsReturn...');
       await avmContact.methods.avm_addArgsReturn(a, b).send().wait();
+      logger('Success');
     });
   });
 });
diff --git a/yarn-project/simulator/src/public/executor.ts b/yarn-project/simulator/src/public/executor.ts
index 262af02a2aa2..cba1f69830b8 100644
--- a/yarn-project/simulator/src/public/executor.ts
+++ b/yarn-project/simulator/src/public/executor.ts
@@ -5,9 +5,9 @@ import { Oracle, acvm, extractCallStack, extractReturnWitness } from '../acvm/in
 import { AvmContext } from '../avm/avm_context.js';
 import { AvmMachineState } from '../avm/avm_machine_state.js';
 import { AvmSimulator } from '../avm/avm_simulator.js';
-import { temporaryMapAvmReturnTypes, temporaryMapToExecutionEnvironment } from '../avm/temporary_executor_migration.js';
 import { HostStorage } from '../avm/journal/host_storage.js';
 import { AvmWorldStateJournal } from '../avm/journal/index.js';
+import { temporaryMapAvmReturnTypes, temporaryMapToExecutionEnvironment } from '../avm/temporary_executor_migration.js';
 import { ExecutionError, createSimulationError } from '../common/errors.js';
 import { SideEffectCounter } from '../common/index.js';
 import { PackedArgsCache } from '../common/packed_args_cache.js';
diff --git a/yarn-project/types/src/abi/contract_artifact.ts b/yarn-project/types/src/abi/contract_artifact.ts
index 8aa986313ebb..f63e4dcd96a3 100644
--- a/yarn-project/types/src/abi/contract_artifact.ts
+++ b/yarn-project/types/src/abi/contract_artifact.ts
@@ -130,8 +130,7 @@ function generateFunctionArtifact(fn: NoirCompiledContractFunction): FunctionArt
  */
 function hasKernelFunctionInputs(params: ABIParameter[]): boolean {
   const firstParam = params[0];
-  return (firstParam?.type.kind === 'struct' && 
-    firstParam.type.path.includes('ContextInputs'))
+  return firstParam?.type.kind === 'struct' && firstParam.type.path.includes('ContextInputs');
 }
 
 /** Validates contract artifact instance, throwing on error. */