Fix compile warning
Code cleanup
Minor cleanup
Minor clenaup
Merge remote-tracking branch 'origin/master' into feature/object-save-loader
Code formatting