Refactor

Safe checkin