Address inconsistent type vs location_type usage

Opening for build, please ignore for now.
E302 expected 2 blank lines, found 1