More Syntax Cleaning

Cleaned more syntax stuff.