Trying to improve list module