Make it more "angular way" :)