Changed logic initalization, as it was redundant