Coding style fix in package related source files

IMO it was better before