More Refactoring Cleaning up