Cleaning up for angular