Implemented formatting of output, eliminated need for entity classes