OA-645 more style fixes