Refactored Unit Class