Minor shader code cleanup