optimization by intellij
adding serialization
fixing problem with not removing double quotes