Refactoring
-Aaron