Cleaned up some syntax