More Refactoring done!