Added angular and cleanned up