Code style + update package options.