Refactored Employee class