Dropped more columns and consolidated code