Switched column order as per code review