remove thymeleaf basics, fixed formatting