UC-156 Improve style compliance