Better comments
Inline location parsing and keep locations as string
Make ActiveSupport available for specs
Simplify complex method