conform to foursquare api update + some refactoring
some more refactoring