clean imports
remove old comment
query supply points by location instead of code

- misc autoformatting changes that snuck in