more style fixes
Merge pull request #11 from peterschuelke/3.x_OA-645

OA-645 more style fixes