Improve list structure