Added html cleanup