Refactor and add more verbose responses with attitude