Improve variable names
Simplify main function
Add instruction to setup; fix typos