Cleanup
Refactored JSON serialization
FIxed shit