HTMLAcademy refactored