Code cleanup + finish();
Merge remote-tracking branch 'origin/master'