Update links to work in forked repo
dry out strings
extracted class BottleNumber