attended comments and refactors
removed httparty