Jona's repo commit + Cravacuore's repo commit + ScalaStyle corrections