cleanup and fixed and angulerlize.