Use split listing states
Improve listing helper methods
Whitespace
Version 0.8.2