Cleaned up doctor