More code cleaning. made all & signs into &amp;