Improve lister and remove struct tags