[TASK] #REFACTORING Fixed coding guidelines