Fixed collision variables
Cleaning cp class
Reorg some METHODS