Clean up
Add fl to JSON