Attempt to clean things up for our project.