Make the code more a bit more conventionnal, nicer.