More Refactoring!!!!!!! :D