- fixed leak
- removed unnecessary mutable data object.