Clarify some code
Add Define Command