Change respond_with to include correct location
Some style fixes