Clean up
Avoid useless initialization