Substrate preparation and pre-treatment