We won't use the user's position
Some refactoring