Refactoring: added JSTL removed old code