Cleanup. Now parses json and easy list creation