Cleanup code
Cleanning code