Cleaned up imports/members and added json file dumping