Groovy

Homogenize the code, mainly