Refactor to make the gem work in Sweden.
Simplify calling methods a little