'make format' fixes
Merge pull request #23 from harshavardhana/formatting-fixes