Cleaned up Surfer.main