Removed some unnecessary (doubled-up) code
Added a TODO file
Moved MACHINE_NAME environment variable to an alias
Minor formatting fix
Changed some comments