Refactor step definitions
Refactor relationship steps
Refactor geolocation steps
Finish cleaning up step definitions