Cleaning code: non "strict standard" code modified (methods declared as
static when needed)