Refactored, getting rid of an unnecessary item