Clean up

Cleaned up industry conditionals