Refactoring-- cleaning code!
More code refactoring.

Made it prettier!