First review old code

* mutable array to nsarray
* code cleaning