Refactoring

[leotaozeng]

Now that we have a working program, go back to it and see what we can improve.

• [x] Can we add some functions to make the code more byte-sized?
• [x] Can we add a class & object somewhere?