Reduce class complexity