Cleaning things up for my project.