Lister completed
Lister bugfix + code style