expression deserialization + refactoring