Code standart fixes