FTFY
FTFY as well
Formatting issue
Merge pull request #1 from farcaller/master

Code cleanup and C++ification