Cleaning, reformatiing, organizing imports
This commit should work. Still no json.