Config / style / syntax cleanup