improve list
improve code