remove more cruft, better closer detection
much improved indentation for lists