Code cleanup
Code cleanup
Merge from master: Code cleanup