Fix style in upgrade-angualr branch