Remove exact address, improve Polytech formatting