rm comment out, indentation
rm unnecessary include
Merge pull request #35 from tazima/topic-miscellaneous

Topic miscellaneous