Untagle those spaghetti a little bit by splitting the method