reorganizing my code