JSPadmin refactoring