Convert to cleaner Angular