Move columns into code