Refractor, ensure empty classes
cleansing code, and typo
Merge pull request #1 from nainglinaung/master

Refractor, Ensure generate Command