Clean up code for generating supply request table