Clean up code pass 4