Clean structure of my code