cleaning up the code cause we're professionals.