Code clean up
Merge