Updates to use case classes for json serialization, removed stupid hanging comment