usuniecie constants, zmiany structures