Improve quality of most complex class/methods