implement Davide's comments and naming convention
naming convention
implement naming conventions
propagate naming convention in tests