Refactor medical