angular clean up; styling clean up