Misc style fixes and packaging