Corrections
Cleanup
Simplification
Merge remote-tracking branch 'origin/master'