Improve previous commits (comments, listView type)
Indentation + comments