A little code cleanup
Revert "A little code cleanup"

This reverts commit aa98867282fa59aa393107aa5ec694555b0db92d.
Merge remote-tracking branch 'origin/master'