HJ styles cleanup