Action -> Endpoint

Cleaned up some additional areas