cosmetic change and angular elements cleanup