import cleanup
refactor to json objects