Cleaned up data-setup code