Clean up bumpmap code a bit