Fix default values
Cleanning code