Use same markup style everywhere [ci skip]
No magic numbers [ci skip]
Add Gittip Badge [ci skip]
Some cleanup [ci skip]
Indentation fix [ci skip]