Argonaut code cleaning