fixed type and refactored html checkers