Clean up to make http routing easier to read.