small refactor to make things follow the "angular" way