Refactor CurrentSize to Size