Refactored and kitted