Cleaned up things after the previous commits.