Refactoring for performance issues

Angular is a shy little girl and you have to prepare anything
complicated in the model for her