Tidy up vertex shaders and bring the current code inline with the rest