[BACKLOG-407] - Check styles cleanup