Computer Class Refactored