Remove padding
Refactor out user location