Let's simplify the code a bit

Those lines didn't found a way from my head to my hands... ;)