Some cleaning in the code structure.