superiotool: Cosmetics and coding style fixes.