Revert "Cosmetic changes + styling."

Reverts cesanta/v7#23

Contained merge conflict marks