Started refactoring __str__() to be more terse