Cleanup code
Cleanup code