code refactor in sertup data class