Syntax Cleaning

Cleaned up some of the syntax.