cleaned up some syntax