This code smells less then previous