Final core package proper code style fixes