Made the data class defines pretty