Refactored Classes Further