Fix issue too much stuff going on in one line