Saltwater Bottom / Sand Cleaning Fish or Invert?

I have diatoms on my sand and some algae and I am looking for either a fish or invert(s) to fix this. I have a 40 gallon tank. I have aragonite sand. I was thinking a yellow prawn goby? Suggestions?