Feature/style improvements

'MP6-ification' style updates.