Mainly style fixes
No idea why importing variants at a package level into its own package