Got rid of nested data structures