Refactor of webjsp part, code cleanup