Basic cleanup and add base angular functionality.