add angular and clean up json