Switched shader std::map to use int key instead of string
Minor cleanup of render code