Code cleanup
Cleanup