Pivotal endpoint
Refactor and better output
Fix typo