html part refactored