Code cleanups.
Use json for file info