Cleaning up for upcoming pull request