Organizing my code some more