Program after cleaning up my code