Code cleanup
Cleanup code