Cleaned up some syntax and imports