-Clean up code
Merge pull request #22 from rheicide/DungLe_Cleanup

-Clean up code