Feature/3 fix style errors icalvete