40 data class style update

closes 40