Clean up code pass 3