Minor shader cleanup