Fix input variable modification by transfromIn, cleanup co & ci
code cleanup