From mutable to immutable. More functional style #2