Code cleaned. Erased TODOs.