Adding review todos to Passthroughservlet
Adding some review todos
Minor refactoring