Minor refactoring of Controller servlet and jsps.