Cleaned up after making changes