Cleaned up the two xslts