nothing important but rearranging code...