Refactorization part 5: minor code modifications in loading servlets