Code cleanup
Merge resolution
Code cleanup
Code cleanup
Code cleanup