Clean up; Columns and offsets now use a looping class for creating rules