Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 23c265e4d1b4aa71202da789bf2500ac0feaae6d, reversing
changes made to d5ebbb28ca81c35936e820119e3d7d45734e3574.
Code refactoring

Enforcing code convention.