Small refactor. One uncomment fix.
Merge remote-tracking branch 'origin/master'