Minor improvement to the code.
Commented default attributes