gennariarmando Code clean up.