Refactoring.
Refactored.
Fixed appearance problem.
Refactored code.
Merge pull request #1 from JGefroh/refactor

Refactored code to not be as messy.