clean up markup and less