Migrated more commands to using defines, clean up of code
Improved stars example