Coding style fix in package related source files