Partial Refactor of Computer Class