Fix serialization
Remove log
Code formatting