renamed a few monthods for clarity
removed hard coded urls