Updated according to code standarts