Syntax clean up

Cleaned up syntax