Cleaned up data module a bit.