cleaned up the data class a\ bit more