Refactoring some code so it makes more sense. thank god for IDE refactoring.