cleanup, (little) more eye candy
Merge remote-tracking branch 'origin/master'