Code cleanup. Updated Angular version.