Fixes Code standart after merging