Fix code style errors

Hope I've caught them all