Code cleanup
Merge