Cleaned up and fixed the data module