modernised
Style fixes.