fixed remaining code style issues