Too complex method

Try avoiding complexity